Merge: Fix minor problems prompted by GCC 4.6.0 warnings.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 May 2011 19:32:43 +0000 (12:32 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 27 May 2011 19:32:43 +0000 (12:32 -0700)

Trivial merge